Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 09:45:27 +0000 (11:45 +0200)
committerJan D. <jan.h.d@swipnet.se>
Fri, 2 Apr 2010 09:45:27 +0000 (11:45 +0200)
commit01eeba4ccb7a9e62f00e92b8a746a9df15c8d446
tree31913b18c94c7dfb0212b6c237a538f650c920ae
parent5f0e225abd7f484995b9a5412c14b5411c6ab923
parent513a30fb7bd59107069959a90eacd966785f3743
Merge from trunk